Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add aarch64-unknown-linux-musl support #2493

Merged
merged 2 commits into from
Sep 30, 2020

Conversation

Gelbpunkt
Copy link
Contributor

See #2003

I have no clue what to do with the .github/workflows files as they state not to edit them. Same applies to tests/channel-rust-nightly-example2.toml which seems autogenerated.

This is mainly the result of a grep for aarch64-unknown-linux-gnu and appropiate changes

Copy link
Contributor

@kinnison kinnison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to fix up the stuff I mentioned, and then in a separate commit, please include the results of running bash ci/actions-templates/gen-workflows.sh

ci/actions-templates/linux-builds-template.yaml Outdated Show resolved Hide resolved
ci/actions-templates/linux-builds-template.yaml Outdated Show resolved Hide resolved
@Gelbpunkt
Copy link
Contributor Author

@kinnison all done!

@kinnison
Copy link
Contributor

Okay the build has failed - the compiler appears to be missing - https://github.com/rust-lang/rustup/pull/2493/checks?check_run_id=1134461439

This does not bode well.

@kinnison
Copy link
Contributor

This time the build got a lot further but then failed to link because of the floating point library perhaps? I am not a musl expert. Look at https://github.com/rust-lang/rustup/pull/2493/checks?check_run_id=1134498637 and see if you have any ideas.

@Gelbpunkt
Copy link
Contributor Author

Gelbpunkt commented Sep 18, 2020

This time the build got a lot further but then failed to link because of the floating point library perhaps? I am not a musl expert. Look at https://github.com/rust-lang/rustup/pull/2493/checks?check_run_id=1134498637 and see if you have any ideas.

Seems like rust-lang/rust#46651 - what would be the steps to set compile arguments in the build here? (Can probably imagine using RUSTFLAGS)

@kinnison
Copy link
Contributor

I am not sure as I've never had to do that before. I think you'll need to see help from outside, but I'd guess setting the ENV in the dockerfile maybe?

@Gelbpunkt
Copy link
Contributor Author

ENV would probably work. Just a question - this seems to run on a stable rust toolchain base, which does not include rust-lang/compiler-builtins#377 (which should fix this). Is it possible to use nightly or are rustflags in ENV fine for now?

@kinnison
Copy link
Contributor

We explicitly use stable. If it makes more sense, we can wait for a release which includes the fix, rather than pushing for things now.

@Gelbpunkt
Copy link
Contributor Author

It seems to work with the rustflags. I don't think it hurts to include them and it is easy to remove once 1.48 is stable and probably better than waiting.

@Gelbpunkt Gelbpunkt requested a review from kinnison September 26, 2020 17:41
Copy link
Contributor

@kinnison kinnison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep this looks plausible. This needs rebasing into a commit which adds support for the platform, then another which contains the regenerated workflows. This platform should probably be skip-pr skip-master for now.

@Gelbpunkt Gelbpunkt force-pushed the aarch64-unknown-linux-musl branch from 413cc89 to 202a4c7 Compare September 30, 2020 17:11
Make the platform skip-pr skip-master
@Gelbpunkt Gelbpunkt force-pushed the aarch64-unknown-linux-musl branch from 202a4c7 to 629b75c Compare September 30, 2020 17:13
@Gelbpunkt
Copy link
Contributor Author

@kinnison I hope this is what you expected 😄 If not, let me know and I can change it

@kinnison
Copy link
Contributor

Looks good, thank you. We'll see how it goes at the next release :D

@kinnison kinnison merged commit 3c29741 into rust-lang:master Sep 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants